Skip to content

merge 2.11.x onto 2.12.x #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 10 commits into from
Nov 17, 2015
Merged

merge 2.11.x onto 2.12.x #153

merged 10 commits into from
Nov 17, 2015

Conversation

SethTisue
Copy link
Member

No description provided.

adriaanm and others added 10 commits May 8, 2015 12:07
@adriaanm
Use scala-ci's artifactory and bintray repositories
6d1fc59 
Aligning with https://github.com/scala/scala/blob/2.11.x/scripts/jobs/integrate/bootstrap#L123,
as updated by scala/scala#4496
@adriaanm
Merge pull request scala#148 from scala/artifactory
76306f3 
Use scala-ci's artifactory and bintray repositories
@bkanuka
Explicitly requiring Java 6 or above
897057d
@bkanuka
depend on java6-runtime-headless
c8bc132 
Thanks to @ebourg: depend on `java6-runtime-headless`. Also dropped `openjdk-7-jre-headless` as it's superfluous.
@adriaanm
Merge pull request scala#149 from bkanuka/patch-2
282f468 
Explicitly require Java 6 or above
@SethTisue
misc improvements to readme
63976b2
@muuki88
FIX scala#141 Upgrading to native-packager 1.0.4 and autoplugins
1da1582
@lrytz
Merge pull request scala#152 from SethTisue/readme-updates
611b24e 
misc improvements to readme
@SethTisue
Merge pull request scala#142 from muuki88/2.11.x
6b3dd49 
FIX scala#141 Upgrading to native-packager 1.0.4 and autoplugins
@SethTisue
Merge remote-tracking branch 'origin/2.11.x' into 2.12.x
d4b02c9
@SethTisue
Copy link
Member Author

review by @adriaanm

I'm assuming here that java8-runtime-headless exists just as java6-runtime-headless does (right @bkanuka, @ebourg, @muuki88?)

@ebourg
Copy link

ebourg commented Nov 17, 2015

I confirm it does exist (and java9-runtime-headless too)

@adriaanm
Copy link
Contributor

LGTM

adriaanm added a commit that referenced this pull request Nov 17, 2015
@adriaanm
Merge pull request #153 from SethTisue/2.12.x
b8b1271 
merge 2.11.x onto 2.12.x
@adriaanm adriaanm merged commit b8b1271 into scala:2.12.x Nov 17, 2015
@SethTisue SethTisue deleted the 2.12.x branch November 17, 2015 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@SethTisue @ebourg @adriaanm @bkanuka @muuki88 @lrytz